merge from trunk

diff --cc configure.ac
index 49660f62519980a277a3a8906202ff97eec9c122,3a31198988705f7572153be5a4cb6dada30f3143..7d433e952019b3f113da5023e09e154fbb511546
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -4851,12 -4817,9 +4856,13 @@@ echo "  Does Emacs use -lfreetype
  echo "  Does Emacs use -lm17n-flt?                              ${HAVE_M17N_FLT}"
  echo "  Does Emacs use -lotf?                                   ${HAVE_LIBOTF}"
  echo "  Does Emacs use -lxft?                                   ${HAVE_XFT}"
+ echo "  Does Emacs directly use zlib?                           ${HAVE_ZLIB}"
  
  echo "  Does Emacs use toolkit scroll bars?                     ${USE_TOOLKIT_SCROLL_BARS}"
 +
 +echo "  Does Emacs support Xwidgets?                            ${HAVE_XWIDGETS}"
 +echo "       Does xwidgets support webkit(requires gtk3)?       ${HAVE_WEBKIT}"
 +echo "       Does xwidgets support gobject introspection?       ${HAVE_GIR}"
  echo
  
  if test -n "${EMACSDATA}"; then

diff --cc src/lisp.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge